From: Jonas Dreßler <verdre@v0yd.nl>
Date: Thu, 5 Dec 2019 07:55:16 +0000 (+0100)
Subject: dialog: Remove addContent function
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~209
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=914c6e48b1b2a6d2fc4724988221d373aded5dca;p=gnome-shell.git

dialog: Remove addContent function

Now that child metas are removed, there's no need for a custom
`addContent` function anymore. It was only used in one place anyway...

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/886
---

diff --git a/js/ui/closeDialog.js b/js/ui/closeDialog.js
index 86d14059a..8353b56cb 100644
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -67,7 +67,7 @@ var CloseDialog = GObject.registerClass({
         this._dialog.width = windowActor.width;
         this._dialog.height = windowActor.height;
 
-        this._dialog.addContent(this._createDialogContent());
+        this._dialog.contentLayout.add_child(this._createDialogContent());
         this._dialog.addButton({ label: _('Force Quit'),
                                  action: this._onClose.bind(this),
                                  default: true });
diff --git a/js/ui/dialog.js b/js/ui/dialog.js
index c2d2e04b6..0799ad27f 100644
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@@ -99,10 +99,6 @@ class Dialog extends St.Widget {
         return this._initialKeyFocus || this;
     }
 
-    addContent(actor) {
-        this.contentLayout.add(actor, { expand: true });
-    }
-
     addButton(buttonInfo) {
         let { label, action, key } = buttonInfo;
         let isDefault = buttonInfo['default'];